Removed hack for testing.