Revert 5cc2ba6..347880c

This rolls back to commit 5cc2ba634ee9f1fdb170340091981886fea6355e.