Rollback last change and add flag to make it compatible with Erlang R16 and R17