Reverted to previous module equalization behavior and added border-* selector to it.