Revert b8d7880..2a58f4c

This rolls back to commit b8d788003cfdbacc4af444d6a2d5dc4316a0beaf.