Revert previous changes

Teajizzle's proposed fix doesn't quite compile. Reverting back to original.