Revert "Still indecisive..."

This reverts commit 0c53834237c31e283c0b5d41bc5c25f782ec63ad.