Revert 192079c..b1689ed

This rolls back to commit 192079c0f8f5b88622c28dd93c77bd9ad02c8dc4.