Revert ffa0b26..7cde348

This rolls back to commit ffa0b2656f90162a4067a6c8ce18f8a6a6c094ac.