Revert 841f82c..0cfe6ac

This rolls back to commit 841f82cdbce80f2b9804cf24a317c3a5b13b6ff3.