Revert "Revert "Port of 2014""

This reverts commit 1b29dc8337ec5cf3192e84caa0af6ec5f167f477.