Revert 939e6c7..a59cbc3

This rolls back to commit 939e6c77a6cb581a969da7dd6a69d5192f3e7df2.