Revert a612341..eb7e8c9

This rolls back to commit a6123417356aff269e0649f086bb1698adafa979.