Revert 348c23e..548ceac

This rolls back to commit 348c23edf6f357bc23d395aac3987dc528a2f709.