Revert 4cdb5e3..bbc54d0

This rolls back to commit 4cdb5e3a5418834e75b7f5cb73901dc74dcf158c.
morning