Revert c591248..f9da3ea

This rolls back to commit c5912487d1d51515eb7de1c9a04d9722d50dc003.