Revert 18e47af..67ec9ec

This rolls back to commit 18e47af2a28e310e1f9d39773991281cf459ae88.