I thought this had already been merged since I haven't seen the issue in any recent PoS testnet build.
