Move original identifier pulling from options outside of dummy header block
(cherry picked from commit 1ccd2dcf9e0ea656242268441a9b84e164d11703)
Merge branch 'master' into rails-3