AUI-946

@zsigmondrab said this fixes a client issue for him, so while it's probably not needed for 2.0.x, can we incorporate it into 1.5.x?