Revert dacd102..5bcad55

This rolls back to commit dacd1024ffa3bf7a999bae688562a9a1206b3594.