Revert cbde5fa..f9c7c16

This rolls back to commit cbde5fae5d8ba5a091e14cc941da3bd00bada2d0.