Revert "Revert 1086418..c0fe06f"

This reverts commit 9411054507662528fd477137174fc47c502d3604.