Revert "Shalala"

This reverts commit a142706efce69f1b2c23982b8a6c2e352449c6e3.