Revert "merged rbalint's pr27"

This reverts commit 5283614bec09c856ca0e71174ff9538ba1e8dae1, reversing
changes made to 4ecef4db08c23d00fd66371970289c79acc2481b.