Revert 886c2a0..ab71be6

This rolls back to commit 886c2a0c04a1cdadd939ba6ed647de61cf2308f2.