Revert "Proposed changes"

This reverts commit 2ca14a2c787c9641647d3ddd7c9dcbd00b223637.