https://secure.phabricator.com/differential/diff/46823/