Revert "Pattern class update"

This reverts commit 9733e50284842a3478e3ada63c80c7a4c901a8d7.