Revert 5b12486..78bf1c5

This rolls back to commit 5b12486b0a9938771293faaa15b6cbe3f5e6f380.
bugfix?