reverting @farr's proposal change for now :smile: