Revert 97d6554..1971415

This rolls back to commit 97d655463a1e5fa85576c0d29480fd40a16c8412.