Revert 9cd652d..8f9dc33

This rolls back to commit 9cd652d806c127b1ab1953d11cc342071d1903f8.