Revert 78c0fcb..b91ab0d

This rolls back to commit 78c0fcba4b46be84c211ac3ce2e8310aa5b6ae46.