Revert 26e4122..3341a9c

This rolls back to commit 26e4122786208dfc7a31f8eb7625c71e41b78f43.