Revert part of previous commit

This reverts commit cde3a0cf69228df7b9debf3d46b5c1e4d88931db.