Revert "Another idea for #6"

This reverts commit f170a1b9d7a2353ddf598800bb79bbb236ed18ca.