AUI-1648

I'm not really able to write any tests for this. The current set of tests "should" catch any issues, I assume.

After rebasing from master, I'm no longer able to run gulp. So I was unable to test this. Everything "should" be fine though.