Revert "Port of 2014"

This reverts commit a627c597baeebff8f51739453129aaa33b4a5edf.