Reverted a bit of code I've been tinkering with.