JBCTS-1375

This reverts commit 8d73c632bb9bdbe6c641a04f33a6dd9bb4abf516.