Is this still necessary given the changes below?