Workaround [AMP] is not necessary anymore