Revert "Rev2"

This reverts commit 85eef463da8194342c6ecc40794f9d226ffba1d6.