revert changes which broke 4.3 build