BUILD-441 Trying again since I don't know why it shouldn't work