Revert d1929da..6cf3766

This rolls back to commit d1929daf723b8a9fac52503034d7c248d4c383ed.