Remove workaround since MAID-514 is now merged