Revert 2b5ac1b..0f000ba

This rolls back to commit 2b5ac1bee1a26988eebb31aa7f27f6851f75b806.