Revert 5b5d667..e9e80bc

This rolls back to commit 5b5d667aae65446c0e3fc3f735050d7dcc511d8c.