Revert bb0c41d..1ea101b

This rolls back to commit bb0c41dd53cc59e239b3ec14241823042c549ca2.