Revert "Changes required to make Semaphore kernel work on Aries devices"

This reverts commit f2073802d37b6482352ec72a79bfe5c22e0b2141.