Revert bd3278c..45884c3

This rolls back to commit bd3278cd2d17815350c56519c16933f65451e0ee.