Revert cc9cc57..673c892

This rolls back to commit cc9cc5700b5b0dc200c71304c4c2b51011067c47.