Revert 4fb6867..580b4eb

This rolls back to commit 4fb68675627167c61e8815c53830b57ffda89a46.