Revert "rwar33"

This reverts commit 92105474dae0c3e689e7929104a28019d39b031a.