Revert 354ed4c..f4f512d

This rolls back to commit 354ed4cefa5dee98b22ef0aab7a14d37f4632897.