Revert 372ede4..daa8f9c

This rolls back to commit 372ede4bb272791ccf02fec2fbc35106da822714.