Workaround for TNL-726.

https://openedx.atlassian.net/browse/TNL-726

Also see:
https://groups.google.com/forum/#!msg/edx-code/6H0MPfWB3CU/5-3pNoYbOMEJ