Revert fcfecde..310923a

This rolls back to commit fcfecde1e78724c565034313e7b5294f032ad13a.