Revert 501e8f4..13bc28a

This rolls back to commit 501e8f425f48c3a73c56068b13fcd59f0bf879ea.
Revert 13bc28a..e06a75a

This rolls back to commit 13bc28a4b880aa4b0a80b1f6ae56c5e06d1b4077.
Works again