Revert "PS: Update non-static label implementation"

This reverts commit e21144c46f540747947db361932613eb5d77f2bb.

Reason for revert: Minimise changes in core during code freeze unless it is essential for the release. This PS must be applied immediately after release v1.4.0 

Change-Id: I15f39c0a093c75841c051d015a9b9202db848fcd
5 files changed