remove ugly macro (6578912)