Revert 052a4b5..bb03878

This rolls back to commit 052a4b53f2480c737f1b17da08775b8be3c4f735.