Quickly hacked in API breaking EM compatibility