Revert 6bdfa9d..0260925

This rolls back to commit 6bdfa9d02c977a3270e304ce8f220255a5a0dd54.