Revert da5ae2c..b391a8e

This rolls back to commit da5ae2cca8bb9b81b7016f223544ba298e4c052c.