Revert 66c5c11..80112ef

This rolls back to commit 66c5c11a0cb22de8401c895ea4dd2bfbc819f155.