Revert f86defe..663efbb

This rolls back to commit f86defea7f2af94162d46843c44ffb7f73013998.