Reinstate reverted change

Build failed because:
* Teamcity didn't have Ophan API values
* Javascript warning

These are fixed now so change can be remerged.
See #1587