BISERVER-8721 Pulled some padding back in for alignment