Apply RxJava #1625 manually