Revert ff306d9..fd52c48

This rolls back to commit ff306d928d82b672c6adc11b50330ff3ae0fdbf7.