Revert e3dee72..40e510a

This rolls back to commit e3dee723e9770d68cde9c6cd33ea906ff8d62d4e.