Revert "Enhancement #423"

This reverts commit d06b5735cad4cba3d8ff19fe57db4b30e3039a26.