Revert 7b7bf81..62ce99d

This rolls back to commit 7b7bf8122cb7c90cf0cb5bc849edefa9eab3c560.