Revert ab5e447..b032675

This rolls back to commit ab5e447b95080f43bcb1a0552a8af99da97431e0.