check in changes required to unbreak IntelliJ IDEA