Revert ef4e314..ff7db4f

This rolls back to commit ef4e314acb5e9f90ee98e25995d9dab620d2fc4f.