Revert 48a4fb1..b615353

This rolls back to commit 48a4fb1f769494765d0181999bf49fd316c3b200.