closes #361471
So, this is a very quick (and probably dirty) fix for the linked issue. However, I think we should discuss how we should handle it in a more appropriate way.