Revert 9a00210..675096a

This rolls back to commit 9a00210047c940824bf9448617e4d03275c84704.
xxxxxx