Revert to 2efa5c1976510612fc667c6217886e17680bd97c