Revert 137393fba65d3703bfbc1fa48b832555389a21dc

Usability over semantic correctness