Revert 371a544..23920e5

This rolls back to commit 371a544e1fc86eaf34454954f10457e58ec4c008.