Revert "#1668"

This reverts commit fc26eea95fb3e097f4d5101e73455ad51ca354ea.