Revert f8d39eb..b754b56

This rolls back to commit f8d39ebe6ffa588c7eef2c997b4c24eead3bd7a7.