Revert c3ff554..438230b

This rolls back to commit c3ff55430e55dc5322c4bccfb0847d4fcf2711d5.