Revert bda35f6..246e4e8

This rolls back to commit bda35f62362f3344bdf0bf4bffb6fce718ce2681.