Revert d1d60fe..b67bff8

This rolls back to commit d1d60fe84a2169d3c65a90b01859419540f07508.
Revert b67bff8..84f82d6

This rolls back to commit b67bff858f62e4970eeba1d0f046a3a1b6075c27.
folder_page