Revert a812adf..bd4bc8f

This rolls back to commit a812adfc88ff6e7f93edcbea8534fe2132002fdf.