Revert 5e138ef..2a189ff

This rolls back to commit 5e138ef413556aa6074705bd2bfb888ddf7eecbf.