Revert 67b5a1c..cf94d4b

This rolls back to commit 67b5a1c93f58d371ebd2f69c4d67cb49d42ef412.