Revert c5f6a50..b493783

This rolls back to commit c5f6a506fd16549c5599eea3e3048277ebf2878e.
Revert b493783..1603d8f

This rolls back to commit b4937839218f41ff76b173e7478dccd2464d9df3.
Blub 2