Revert "Revert 39a5ae9..44e512f"

This reverts commit adf7e49e81b90b6a631a3ea1ffdcac3008780494.