Revert "Merge branch 'ticketID' into Dev"

This reverts commit 5ddbe9674825e2fefd375761bf53ba90e34e8b7e, reversing
changes made to fe4ae3c944d29c6e5496553b5dc28ae39ee15c52.