Revert "fixin bočo's merge errors :P"

This reverts commit 9fd2e227c374cc00bfe6e9b14415359ab03b4688.