Revert c964beb..4c86821

This rolls back to commit c964beb0fa582797b25b4eef14cf64f31196d766.