Revert 7e16aae..d872c56

This rolls back to commit 7e16aae203f3ab98aec7124bd1c6dd1aafde3d6e.