Manually implemented jmhobbs:patch-1