Re-fix #255 / #254; broken after moving around gradle stuff; making sure it doesn't happen again