Revert 15f3801..02d2886

This rolls back to commit 15f3801ab03edd1c9519c38ef779faad5515f846.