Reverted hack to get Monaco working