Begin rewrite
Revert "Begin rewrite"

This reverts commit 4658d7296bc323cf54e2d78417aed4d2b3895d07.
Updated to work with CB 1.4.7-R0.1