Revert 9b38c5c..d9c6979

This rolls back to commit 9b38c5c0bbff3fc29de05a68d81d602176840e46.