Revert edf417b..061ac56

This rolls back to commit edf417b0717748301b8c9b8ce1db3467c6cd5712.