Revert 2edfcf4..1ec79ab

This rolls back to commit 2edfcf496fcdcde83464a88fc121a355c8532dc7.