Revert a058820..0b5f952

This rolls back to commit a05882008cf556ec8198ebda5faed6a05b9d874b.