Revert 787bff5..533e63e

This rolls back to commit 787bff50c7af38359ea31b6ca6d50a98972180f0.