Revert 00988e1..a518769

This rolls back to commit 00988e1a147ea14ec22591c16ab161fd585cf3f5.