Revert "Address another review comment"

This reverts commit 6072cb457ab96163bfd0f0e36f34dabf14cb1ce1.
Revert "style: Fix a bug whereby border-width was not properly set to zero if"

This reverts commit c821e461cc33532506dbad9ddd72b7195fc13d79.
Merge branch 'reparallelize' into parallel-floats
Address review comments