Revert 71f30d3..a0be0b3

This rolls back to commit 71f30d3ad6f617b77b7786973a872cde837bcb66.