Revert 7811807..b381a73

This rolls back to commit 781180751a5c18959bfd7e1b6678620fb9da10e7.