Revert 36e9beb..df3e22c

This rolls back to commit 36e9beb4b9a21c5a44924915083603276cfa7b66.