Revert "Trying to simplify"

This reverts commit 03a8aaab057a6cce04883c5e2ee1101aceaf6879.