Revert "#343"

This reverts commit 6b96c352af261591ca29a6f648657b6a2efe0260.