Revert d307040..aac5d71

This rolls back to commit d307040e94c7fba187ed19f38519a459071d83ae.