Revert "Paul Commit"

This reverts commit 50c0371ce5b3ee77af435bc6462aa31d11222b23.