Revert b300e0e..b200cdd

This rolls back to commit b300e0ef7e8c1d47230042aa34e3126e15a51e1b.