Revert 3a9564e..2b25359

This rolls back to commit 3a9564e73a707a76c92d582e25355c8a12ab4b7e.