Removed workaround for fixed (#490330)
Added a workaround for (#481372)
Merge pull request #1 from mkdesu/master

Committing to my local fork