Removed the old backend hack