Revert "More changes"

This reverts commit a849cb92e9173cd78f2112773691b4fe9c0b5628.