Revert fcb92da..1a3fb2c

This rolls back to commit fcb92da0de62b3a6a6f8a4976fb2cf2a3fecef70.
Revert "Revert fcb92da..1a3fb2c"

This reverts commit 5f09f90087c5250ecd7a46edae7a2c5edb164392.
Revert 126b6de..f91d9be

This rolls back to commit 126b6de3326f33823bbd153e9073c36a28dc2897.
Revert "Revert 126b6de..f91d9be"

This reverts commit f6743318aaa31f6a4ef2faf97bb71bb869aa1a3b.
Undoing a massive fuckup