Revert "Branching off rel-304.4 - AppVersion = u"305""

This reverts commit 60fdcb7508a849f1af6880c8aca3fd8c2387dd8a.