Revert 6ee328c..4aa985b

This rolls back to commit 6ee328c7cf78c06301a641c291833ca43af3e1fd.