This reverts commit 28f4d8513d. The original revert was to revert an accidental merge from master to 4.7. This now reverts the revert on Master, so that we still have those changes on Master.
28f4d8513d