Revert b96b3e7..8589d10

This rolls back to commit b96b3e74c4c2576fd966628a798c3025ff7683d9.