Revert 5f78591..162a54c

This rolls back to commit 5f78591b777ccb479a0c8c74361066435dcf4545.