Revert 54fc823..cf61c46

This rolls back to commit 54fc82342f2761e446b08e776c35417ea1053a38.