Richard Maglaya
Revert "Richard Maglaya"

This reverts commit ad067ec159135e0c9b4a5ca9e8704f19dd99d779.
Revert "Revert "Richard Maglaya""

This reverts commit ed25d7e67fe7013f7a01347a18298f3c8f3fd19d.