Revert 2713e9d..4c693e5

This rolls back to commit 2713e9d0d07468d19bb9b0f671d47fe2df72a1f8.