Revert a2f81dc..b51b171

This rolls back to commit a2f81dc30249d3655cd6d66b0ed00e411376e87c.