Revert 6fe7147..2fcd022

This rolls back to commit 6fe71476a5c7fa3352cd8fcb9b2ff5d23832a595.