Revert 94f751a..1641fcb

This rolls back to commit 94f751aeed92afdf197c0cfba0b19a8fd1fbda95.