Revert 7c60371..40d118c

This rolls back to commit 7c60371037d3ee3de9a27d2c3eb1331c4c60f4bf.