Revert a7fb1be..933f7e0

This rolls back to commit a7fb1be66bcb3cbc9f26e5b385b2fbf22759fe41.