Revert 5ccd5fd..e54d156

This rolls back to commit 5ccd5fdb5507eb85314658533392cafb59b8368e.