Revert 32875f2..80cae55

This rolls back to commit 32875f28af1a8c5929d666252f7114885bb45be8.