Mash up 1.4.1c
Revert "Mash up 1.4.1c"

This reverts commit 61efc6689b7d451e6283b4d3f2833a6f3095bcf9.