Temporarily revert r176882 as it needs to be implemented in a different