Revert a95fe72..cf33102

This rolls back to commit a95fe72736fea06bb044bc30d21982a5769378b0.