Revert 3bf0ae2..03bb707

This rolls back to commit 3bf0ae210348fb3b5bf838e6fe725b055ea0419d.