Revert "Revert 36f4d2b..cec578e"

This reverts commit 05af6ce2d7b1b3da9e51aae89b9dac417fcbd287.