Revert bf436ba..41b9206

This rolls back to commit bf436ba50abcf9de85c71460ff5f974dbcebc627.