Revert b7384c3..9f207bf

This rolls back to commit b7384c30438049efd96e141dfe069f5b5e4f5bd7.