Revert 2155f0a..1c09fd6

This rolls back to commit 2155f0acd0c9ade96526139ea3b7f733fc48b8ba.