Removing hack for separating id from format in keys controller

[merge]