Revert 978675a..b0dba2f

This rolls back to commit 978675ae1153a9b0894a4755c4fe0cd3a72fc4b0.