Revert b1ca5fe..1adfc88

This rolls back to commit b1ca5fef9292214fb7927b0438d06ff344b19336.