Revert 4a0918c..120a5c7

This rolls back to commit 4a0918c8064c59da1ee31a3dd6d7c212cb2a94c6.