Revert bc33284..adf8e7f

This rolls back to commit bc332841acb2b4e4e95d03b2c4cdfe1251121e78.