Revert f019bc6..1c37fb6

This rolls back to commit f019bc67d47645068fdbff65e8145b38c6fadffb.