Revert "Switch to singapore"

This reverts commit 0b8f9e05cf20a230ea4a1e7e7837cb0bbf6d0773.