Revert b4147dc..33e42fa

This rolls back to commit b4147dcac423ef8500ff54903bfc2170582baf89.