Revert f34e884..ef8d34a

This rolls back to commit f34e884a6df0dbffe09082abe6480587ea6d7b06.
askbryan