Revert b578924..914e596

This rolls back to commit b5789245fc169b8c43f177f7352f20529f287080.
Revert fc6d42e..c33cdc9

This rolls back to commit fc6d42ed5b44d0f717b3df523ee05895ddcbf5fa.