Revert "Merge branch 'master' into ItemNameFixing07-2014"

This reverts commit 34f0b1974c94e9f3c0509506457cf0567b5b8f3d, reversing
changes made to fcb2fb9de39c7447df935093e542a335d65b7da9.