Revert de8054a..ff4d4ca

This rolls back to commit de8054ab0683200a95ecbc1382cf67562a2d3f12.