revert inline_injection merge (note, if you want to re-merge this you'll need to revert the revert! see http://git-scm.com/blog/2010/03/02/undoing-merges.html)