Rollback of the hotfix earlier today

There seem to be bigger issues caused by this change. Rolling it back for now..