Revert 7c3448a..195c9e0

This rolls back to commit 7c3448a11507e72684929ef6864c7c2e681509b7.