Revert for revert

This reverts commit c88bf22b5ca70a7dcf1843bfe544262fa0453051.