Revert ddd82ba..a7cf266

This rolls back to commit ddd82ba02488a6f475e578b8c54e1efcff33c062.