Revert 3b63c76..6a76b69

This rolls back to commit 3b63c7651aef5e80f8c1314c3b38e1ab559c2de0.