Followed @kenzierocks advice to actually use the workaround from the bug link I posted.

#25