Revert a7091d8..401bf5b

This rolls back to commit a7091d8d47b7dcea9f182bcc28a37fa0844b1cfe.