Revert d0a68a1..6402000

This rolls back to commit d0a68a1133aac62cdd2dd1938e7fffcc90b74088.