Revert bcd872d..7897106

This rolls back to commit bcd872d43d1022c8e0f35dc4619a0e67442efd44.
More work