Reverted 7a72727a505282829c76dd1901b1beccb3 and merged with other Banrisul enhancements