Revert 90af4e5..4548566

This rolls back to commit 90af4e5f9d39cda337226677e94a95f61aba4ca0.