Revert 12c6f7c..5d34159

This rolls back to commit 12c6f7c478f5933c90df01486a0cb79a7483b328.