Revert 9807b85..66b68b8

This rolls back to commit 9807b85f19bfff5bf144d5fead9189c5bdce98f5.