Revert acfa2e2..d6acfbe

This rolls back to commit acfa2e26252fa19ed2f96a150df268c4fa5fb440.