Revert "Temporarily push D18467"

This reverts commit e3c2f5bed0c83462f893919098dad16d37263698.

As noted in the original commit, reverting this till it was reviewed properly.

Artists are very happy with it in any case.