Reverted a change which broke the code