Revert 700f23d..d576196

This rolls back to commit 700f23d2600ba7512538c8a371c659d4b55b9791.