Revert 023d6ab..7b3bbaf

This rolls back to commit 023d6ab0193cd269e4be5048b26c256a08afb8a4.