Revert f4adad2..6e2d54d

This rolls back to commit f4adad23af3384f8e3f3c7183b05adb0248c4585.