Revert 41e49d4..e795c80

This rolls back to commit 41e49d45c18d0439d1cefea86df8505dd35f7bf9.