Revert a01193d..6030ff4

This rolls back to commit a01193de7ffaae5e0100643e71b3adcb529e16c3.