Revert changes of 16988 and 17038 until I get some aesthetic issues worked out (some...