Bug 7143: Adding back version numbers