Revert "buildplus cleanup"

This reverts commit ffa51eba6e7cb51520f81a973c6d617e3d61f8f7.