Revert 0303a9f..94f7108

This rolls back to commit 0303a9fc11a8fa21d70545f10224ad3cf1d87695.