r4: To keep everything like in the previous binary release,