Revert 4c300c2..b4da47f

This rolls back to commit 4c300c267f684506a95bd2c4057fb75b0ad0cfdd.