Revert f92f9eb..86a2e1a

This rolls back to commit f92f9ebbda7be1fa23e4f38abd09c2dd83e26a51.