Revert bcda868..e1228e0

This rolls back to commit bcda86843be6579f6403ada4107d6491267e4a4f.