Moved apikeys back where it belongs