Revert 06dfe94..551848a

This rolls back to commit 06dfe944f74ba9370b9968492758863956aed5eb.