Revert 68b16bf..3277adc

This rolls back to commit 68b16bff1e1df12c039bdfc75280dfad25e7016c.