Revert ba60c6b..e0025a8

This rolls back to commit ba60c6ba142a28b96d20967bcf10dc566b23c405.