Revert 43857ca..a860130

This rolls back to commit 43857caa62b2636cc19afb43e59546ac1ba638b2.