Revert a1eb64e..dab06e3

This rolls back to commit a1eb64ee996463302f86ffe2c59e7a2a07c46260.