Revert 9572e7c..3606d2b

This rolls back to commit 9572e7c06a868380c3046440083949cb71e2b5b2.