Revert "CEP-545 fix notices"

This reverts commit a8c96ee6ea393f8b7468b84c3df6343e01a6a4c7.