Revert ad40fba..43278f6

This rolls back to commit ad40fba22ffc4cf286f41538e6dd17b4f90cd9dd.