4+1 added
5+1 added
6+1 added
Revert 48e8224..7d7683e

This rolls back to commit 48e82244a7054ecfb83ef24eeed1ab74ca9a7f26.