Revert 14c8dc2..29f2fcc

This rolls back to commit 14c8dc2cf2e557adc39585d6eb391718f2729b79.