Revert 4af170e..c51d0e8

This rolls back to commit 4af170e792782e13dfe897b97f3ec8464d304b25.