Revert 70d784b..2faf78e

This rolls back to commit 70d784b06e3b099ba90807fc06fc07e9f4cea04d.