Revert b839d28