reverted handler changes