Revert 89bfc61..a36cc38

This rolls back to commit 89bfc619e588fdd537915fc643f1de0d9862ca12.