Removed workaround. Closes #3.