Revert 76d2253..d792af3

This rolls back to commit 76d2253ba2c2d0c2d684d7d5e3c7726ed50f6706.