Revert fd9b779..e4342ab

This rolls back to commit fd9b779e6229f102ebe29b4ccdd5b3a6d7504463.